From 1e0622767da23713b9b9fd227a74fd730ca7dbff Mon Sep 17 00:00:00 2001 From: robertl Date: Thu, 3 Jan 2008 17:47:38 +0000 Subject: [PATCH] Make Garmin smartname code handle name and commment a little more independently, using desc to populate comment if available. --- garmin.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/garmin.c b/garmin.c index 57070d968..a06ca796a 100644 --- a/garmin.c +++ b/garmin.c @@ -732,19 +732,27 @@ waypoint_write(void) } way[i]->ident[sizeof(way[i]->ident)-1] = 0; - if (global_opts.smart_names && - wpt->gc_data.diff && wpt->gc_data.terr) { + // If we were explictly given a comment from GPX, use that. + if (wpt->description) { + memcpy(way[i]->cmnt, wpt->description, strlen(wpt->description)); + } else { + if (global_opts.smart_names && + wpt->gc_data.diff && wpt->gc_data.terr) { #if 0 xasprintf(&src, "%s %s", &wpt->shortname[2], src); #endif - snprintf(obuf, sizeof(obuf), "%s%d/%d %s", - get_gc_info(wpt), - wpt->gc_data.diff, wpt->gc_data.terr, - src); - memcpy(way[i]->cmnt, obuf, strlen(obuf)); - } else { - memcpy(way[i]->cmnt, src, strlen(src)); + snprintf(obuf, sizeof(obuf), "%s%d/%d %s", + get_gc_info(wpt), + wpt->gc_data.diff, wpt->gc_data.terr, + src); + memcpy(way[i]->cmnt, obuf, strlen(obuf)); + } else { + memcpy(way[i]->cmnt, src, strlen(src)); + } } + + + way[i]->lon = wpt->longitude; way[i]->lat = wpt->latitude; -- 2.30.2